Minor internal changes to make new_strings land better.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4603 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/gdb.cc b/gpsbabel/gdb.cc
index f7b78ea429a261df2c58aa7ad11301ceb4fffe9b..b9e1d980db43a1b81fd6efe8c33f95bb988e4576 100644 (file)
--- a/gpsbabel/gdb.cc
+++ b/gpsbabel/gdb.cc
@@ -1365,7 +1365,7 @@ write_waypoint(
     descr = (wpt_class < gt_waypt_class_map_point) ?
             ld : wpt->description;
     if ((descr != NULL) && (wpt_class >= gt_waypt_class_map_point) && \
-        descr.compare(wpt->shortname) == 0) {
+        descr == wpt->shortname ) {
       descr.clear();
     }
     FWRITE_CSTR(descr);

diff --git a/gpsbabel/kml.cc b/gpsbabel/kml.cc
index baecac255db4e4a6d3b8a7532dae147578df55fd..e01a53403eeb13121eb33a41a86667ec79e06366 100644 (file)
--- a/gpsbabel/kml.cc
+++ b/gpsbabel/kml.cc
@@ -1374,7 +1374,7 @@ QString kml_geocache_get_logs(const waypoint* wpt)
   return r;
 }
 
-static void kml_write_data_element(const char* name, const QString& value)
+static void kml_write_data_element(const QString& name, const QString& value)
 {
   writer->writeStartElement("Data");
   writer->writeAttribute("name", name);
@@ -1382,7 +1382,7 @@ static void kml_write_data_element(const char* name, const QString& value)
   writer->writeEndElement(); // Close Data tag
 }
 
-static void kml_write_data_element(const char* name, const int value)
+static void kml_write_data_element(const QString& name, const int value)
 {
   writer->writeStartElement("Data");
   writer->writeAttribute("name", name);
@@ -1390,7 +1390,7 @@ static void kml_write_data_element(const char* name, const int value)
   writer->writeEndElement(); // Close Data tag
 }
 
-static void kml_write_data_element(const char* name, const double value)
+static void kml_write_data_element(const QString& name, const double value)
 {
   writer->writeStartElement("Data");
   writer->writeAttribute("name", name);
@@ -1398,7 +1398,7 @@ static void kml_write_data_element(const char* name, const double value)
   writer->writeEndElement(); // Close Data tag
 }
 
-static void kml_write_cdata_element(const char* name, const QString& value)
+static void kml_write_cdata_element(const QString& name, const QString& value)
 {
   writer->writeStartElement("Data");
   writer->writeAttribute("name", name);

diff --git a/gpsbabel/waypt.cc b/gpsbabel/waypt.cc
index 582c29928380384690cad06842220aa1f5ce285d..4aa3ee1bfc7f3424b36f91221aca6012bfc4e14c 100644 (file)
--- a/gpsbabel/waypt.cc
+++ b/gpsbabel/waypt.cc
@@ -32,7 +32,7 @@
 
 #if NEWQ
 QList<waypoint*> waypt_list;
-queue waypt_head; // This is here solely to freak out the formats that are
+ queue waypt_head; // This is here solely to freak out the formats that are
 // looking into what should be a private members.
 #else
 queue waypt_head;
@@ -144,9 +144,9 @@ waypt_add(waypoint* wpt)
   waypt_list.append(wpt);
 #else
   ENQUEUE_TAIL(&waypt_head, &wpt->Q);
+  waypt_ct++;
 #endif
 
-  waypt_ct++;
 
   if (wpt->latitude < -90) {
     wpt->latitude += 180;
@@ -205,8 +205,11 @@ waypt_add(waypoint* wpt)
 void
 waypt_del(waypoint* wpt)
 {
+#if NEWQ
+#else
   dequeue(&wpt->Q);
   waypt_ct--;
+#endif
 }
 
 /*
@@ -233,7 +236,11 @@ waypt_new(void)
 unsigned int
 waypt_count(void)
 {
+#if NEWQ
+  return waypt_list.size();
+#else
   return waypt_ct;
+#endif
 }
 
 void